pre merge with Reza