updated just a bit to match new arguements parser #12