Change with new vision to simplify syntax