Updated for development settings