Reviews

General review of the current functions