Adding in my updated code