Simplify, and actually work