Reveresed the calls. Alot cleaner this way.