completed data and added basic checks