totally redid everything