edited to work on my system