another revision so happy the separated components work together