REFACTOR with previous (area/covers fix)