1. Some changes I replicated from class.

Signed-off-by: neil92 <patel.neil.92@gmail.com>