Everything in place. Minor changes required