fixing remarks, not working at this stage thought