updated for my system
updated for my system and purposes