Commented out extra callbacks