small changes to make work