optomcat added and other changes.