fixed declarations
fixed declarations again
whaaat