final code after integration

final code after integration