made other changes
one
two
main
megar