Made some adjustements