Concluído

PanicMe AdHoc additions and changes