Trying to reduce package size