changed colors and such