incorporate feedback from alex and eric