[EDU-3854] More ideas like this - update to logic