Added business logic functions
added business logic
Another merge