Several initial modifications