GPII-91: Addressed all basic comments.