checked in version 2 of uist code