stash
this is fucked
bugfix and other stuffs