Removed NAACL, edited plans