mark edit 6/3 - MasPhoto