More work on command block