rework

bad parts removed