Change hard-coded assumptions