No longer necessary because of callback implementation