Still not sure if I merge my changes to the right place