also changed if to list form