Simplify new code