add helpers for developer. Cleanup