Added changes to mokups
Resolved merge conflict.