More modifications after feedback from Miciah