pushing adam's recent changes