refactored, removed highlight, made everything a lot clearer