working on adding the second goal everywhere