last commit here, from now changing logics