v 3.0; also remove extra "basic"