Mera Changes (troubles w/ prev commit)