grab some changes from eousphoros