Adding Circle pattern + removing legacy code