Updated latest changes