updated conditions, test this out