added in if !collapse