Changed things around a bit for purpose of future distribution.