added in first part of conditional