Added stuff to get_data