Started fixing face selection