Initial changes to suite my needs.