added comments for possible upgrades