iteration 6 look and func changes