modified a few details