Modified slightly to add a few of my aliases