Updated library functions PART 2