Modified as Required

Most of the issues are resolved but 2 or 3 of them need discussion....