Clean state again. With user friendly features