Made some adjustements following CR.