Reactivate all the functions for further refactor