Really, if you want to upgrade the PS, you would probly be better off going with a new case. Get an Inwin Midtower, 250w PS [mine came w/300w for extra $10]. Will provide much better cooling than that wimpy HP case you got. BTW, I have the HP6630 and plan to migrate it to my old main tower. Much bigger, like at least 2x. gl