small changes 2.0