some adjustements