Oscar's changes