Added some much needed code