updated with html safe