Updated the scheme a bit