Added more conditions, but doesn't run