Modified to support dev mode