Reduced size from 2087 bytes to 1056 bytes