Resolve some conflicting functions that i forgot i wrote.