Cleaned out debug, added arguments