Revert "Revert "Final Update""

This reverts commit a734b990365ed255b27921bde158416ed0a3e6ec.