updated version with work on build updates