Updated to work with callbacks and remove silliness