updated with more html tags