comments moved to appropriate location