adds better spawn setup mechanism