Updated commit

Fixed collision issues