Changed stuff from the fork