need to fix arg passing