final stuff I forgot to commit lol