changed if around