Updated Code... In some ways....!