Merge code fix; Still buggy