Star not fixed, but Plus seems to be; add parsing