forgot to edit some things