started to fix this