Now it is like it should be