Made some amendments for the greater good.