Updates to work with goals