Updated general diagram