Use tags and a few updates