Changed calling order so we dont have to wait 10secs for the stuff to show up!