Derek/fix new and nil