removed wait() calls + override data fields with cli parameters