Improved version, I am thinking about adding upgrades soon