ok changed the whole thing