further refactored name of functions