mergeded and edited in Afinity
