trying to fix this. Blindfolded attempt xD