re-edit with proper markup