Changes that were needed to get end to end working currently