changed after lab meeting
a bit more figgeting
final