Added the masks etc