Adding newest changes for bugfinding