Simplify, update and more