Leon's changes