Removed Entity object
Added circles back to Needle and Match