From original code, I will adjust.