10, Added more to initiallizer and controllers