some modifications done