before merge with kolber