additions from Cody