all maths done
merged