restructured things and added report