refactor out comp as per #119