Making 95% adjustments and organizing data in a more extendable way