almost almost final, added data