now doing what it should be doing - no dummy data