Gymnopédies rework

Gymnopédies rework