Updated From the latest Code

Updated Code with latest Updates.