got a bit further in fixing