Initial Changes

Simplified solution