shavin: made changes with isuru