Streamlined: from 1.367 MB to 1.215 MB