fix cup count, and new PS