Made modes better