adjusted models
removed console
User Functions Refactored