updated to match the other base components and build process