Significant changes, fixed autoextend