fix that and pass some more