removed if condition..