modified some things for makeup work.