Some additional changes v2