changes and color problems. refix