cupsetting almost done..need minor tweaks