minor restructuring
final update (hopefully)