Added the extra 2 components needed