fixed conditions on new requirements