quick base switching added