changed build logic