tightened new partial stuff up