added proper headers etc