Moved sort order array
Remove cloak class
Bunked