yay kind of working even better