Added some additional changes from the local dev machinee