Re-did my tag processing