Lloyd: Overhauled point 2.1