created methods
Resolved merge conflict