still trying to fix tags