Added comments to mark what needs to be done next