Fixed merge, now starting port to SE