Committing new design for quick testing