did some renaming, vector-ized another condition