//some modification made by lane