Fixing man + rock stuff - still needs work