added back olivias fixes