added BPM-Metro
minor changes, still in development