next changes to make more instructions work