added to fixed function and fixed display bug

added to fixed function and fixed display bug final commit for
conditionals personal