deprecate old incorrect parts
add new parts to library for testing