New builder version that make's me a bit more happy