Hopefully additions not breaking anything this time