Taking Implemented
Resolved merge conflict