Initial resurection and redesign