modified by JOnathan
Merged changes