Applied some modification.