revamp. computer got dumped and lost a lot of changes