Rework for the this app