added some more argument stuff