beginning of callback fixes