Updated with my two alterations