[Ready] final changes