Removed OPTIONAL around CW