#4 better auto-registration