this version was made after i messed up on the last one