updated to latest trunk