*Merged changes that conflicted
*Added comments