basic modifications done