Removed hardcoding in args