Updating Working Version