Added the extra changes and fixes