added autoclose and removed surround