Some modifications so it has more sense