More polish based on rehersals