added more eqn features