Remove needs re-ordering, but does work
Hopefully get igws working