modified for msc thesis