Fixed merge problems (caused by Mane's HUUUUUUUGE CHANGES)