Feature/logan/l8 tags