Totally redid everything