Edited so it runs

Fixed merging issues