modified business logic and specs accordingly