Changed style to v2 style