Now handles var sized points and trends