Cleaned up advection