merged expansion part from kenya branch