initial redesigned commit