Make comp clever