Added a few more details, including goals