change color and fix annoying swap