Updating to a reworked Version