full revamp mostly done