Migrate to new com loop