Updated components re: marvin/marvin.