finishing the cmd3 integration