not ideal, but too long ago since i did these changes