changed for master thesis
fixed a bit.
customized.