Updated with 1.6 additions thanks to usstan