fixes to be made