Added basic argument taking