Added back debug for testing purposes