moved defs to let form