More work towards direct emission (for extensions mainly)