Changed my mind, simplify, simplify