App on callbacks
log refactoring