seems to be working
final tweaks