adding potentail fixes, will test later