Updated latest improvements