More big changes, reduced codetext size!