Some awesome additions from Mrzeke