Add redundant data again but now it's better. :)