More work on COM