Added needed code for Orange Tree and tidied up a little!