added a couple switches :}