modified for my system