re-vamped to use local libs
re-vamped to use local libs