Merged with logic