Added some data, thinking about eliminating Double