Aligned code with current staging