Should now store Data correctly