going back to the old code; updated design