bug fix 3, plus added the dyes