Fixed color highlight, added pointer in local