Additional logic change