changes sorted out