Updated for easier debugging