New draft. Remove the apply stuff.