added more logic for builder