Updated Business Logic