merged in steph's changes in info handler