commit to have clean merge with Maz for sprite groupings