changes to accomodate -lib and -core