updated to get tags working