PR from Cale pt 2