upgrade workgroups2
clean code