Diagram + Small entry point fix!