Updated with new code

Here are the new changes