Upgraded to awesome 3.5 and adjusted calls to new standards