Removed crap, added option to make graph