Some modifications from original firmware