adding staging location
removing special case, not quite working right anyway