updated for windows
updated vector