Modiication due to comments