split up diagrams in current and old