more hopefully simplifying stuff