SOme more changes. Forgive the colors