slight changes so it actually works