Some additional changed