moved measurement 6 outside of conditional