Finished merging in AbrarSyed's fixed