Complete revamp of entire package