A little change in structure and now checking for arguments