merges from cmastudios