improved Create safety