Reworked for quick test.