Made Changes as discussed in meeting # 13