Still working on getting child detection working.
Added Neil's changes