Removed function, changed variable order in cond