Added 2 new calls, and PIMPed the style a little