some local changes to get the soln working