removed if brackets, changed parameters