Simple changes. Compile for stack/speed