Changed this around, but I'm gonna try reverting