working pretty good now