fix according to your comments