Some modifycations.