updated for 3.6
cleaned up for 3.6