Adds remaining changes that didn’t push through
	in last commit