Simplify, enforce origin