Reverting to one stage compile