Build omega after sigma
Make build as incremental as possible