Incorporates changes from other repo