Fix maths a bit more?