Made FinalActivity work with new data structure