now to make it correct