Bugs 2 and 3 fixed
Conflict
unmerge
Unmerged