cleaning up new functions