Improved spawn system