removed lucille refs and made it more generic