some adjustments
agaiN