moved source around some more to fit the 'go way'