Added minor modifications