Trying to fix business logic