stage two improved custom adapter