added rest of conditional for other ppl