added last missing components to prototype