Cup Addon re-write V6