some mofifications