Removed some modification