Simplified further, removed less