Made few changes to see the difference between dev and staging and prod