bring oncommand attributes back - they were useful after all