changed logic

merge pls