Updated version (no open)