Refactored; removed Conditions enum