Added some extra inline comments to help with debugging further