Completed more modifications.