reactivate logging and sort new functions