Added addClass and removeClass