Revert some code for new idea