Added debugging and reloading