Did some modification