more shape spawn changes