Added headshots and legshots
Resolved merge conflicts