more changes off flash drive
merged some changes