Some additional changes

Don't know what's going on