updated everything i think