Removing debug for when