Made small changes to meet requirements.