Clean functions and add new one