fixed bugs on new functions