pushing updates to template lib, ugly..