Merged accurate-goals branch