Implemented new functions