sync'ed with source templates specs; better reliability