Make changes as requested by Amo