working on build optimization