Update for new huge update with refactoring
Fix awful git troubles