Added new functions for the last version