improved temapltes and bummped up version