Changed mode to numbers and some other changes