moved sources around to be more consitent