Finished the part of dye

With changes