pre merge with jeff