updated for capabilities being added and cleaned up.