merge modifications of hiuryanderson