Refactor to add staging with no lograge