updated for windows editing