updated makeall