major update. focus on file size reduction