ST3 port + General update/rewrite