Updated for development mode