Main data now working