Some logic change