Updated spawn logic