removed if condition for span