Minor changes/additions
Begin of semester project