helpers cleaned up
paths changed