Added new random builder , but incomplete and buggy