added variables, fixed functions path
removed conflicting lines