updates to jason's chapuza structure