switch to dispersy and clean a bit up too