little opt. changes