added more tags and updated code