changed some variables, and now use path_ helper