Moved sources and added fluid