Big changes to custom libraries....